[automerger skipped] Merge "Remove the ActivityThread#currentApplication()"...
[automerger skipped] Merge "Remove the ActivityThread#currentApplication()" am: 73ee9113 am: edbb8a38 am: 102b6dcb -s ours
am skip reason: Change-Id If67eccda6d016d9140f66e14541c397efbe94d45 with SHA-1 21f88853 is in history
Change-Id: I26ddd409dbe309984d2892eca56a628c138bd9c7