Initial state:
- I landed ag/9652310 (the original change) downstream
- I cherry-picked this change on upstream to aosp/1158971
- This cherry-pick had an incorrect Merged-In tag referring to ag/7911242
- This cl was present between mirror-aosp-master and master internally
Branch CL
aosp/master (aosp/1158971)
\/
internal/mirror-aosp-master (aosp/1158971)
\/
internal/[---] Nothing since ag/7911242 was here
|| already automerger skipped our change
\/
internal/master (ag/9652310)
\/
[various children] (ag/9652310)
See:
https://android-build.googleplex.com/builds/automerger/graph/project/googleplex-android/platform/frameworks/base
How this will fix the issue:
- The revert will go everywhere aosp/1158971 did
- The reland will go everywhere aosp/1158971 did plus to internal/master
This reverts commit 8ed72df3d8e21c06d8b1b848d6e58c15b251d25a.
Merged-In: Ia40303aa2a669c301fab912b0b0bdf5ec1259caf
Change-Id: I3c061fef4f103f0f83147d56ed8019dcb39a7711
25af773ac6