Merge "Update expected call stack for caller of Thread.currentThread()"
am: f50419eee7

Change-Id: Iedff8250db477e8d58304b81ddac9c6ee1072c46