[automerger skipped] Move some logic to MobileState am: d145f34cb1 am: 1023e25b5c -s ours
am skip reason: Merged-In I06d5e56923897cddb53189359dc9444cdfee6e78 with SHA-1 ad2ac7ee56 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15740841
Change-Id: Ibe8ff81a3d63212a34ddbefb1d14cb50989b5f0e
This commit is contained in: