[automerger skipped] [DO NOT MERGE] Compatibilize with git_master am:...

[automerger skipped] [DO NOT MERGE] Compatibilize with git_master am: ff6068ab am: 1b708db8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22425466



Change-Id: I996244706c1be4b4644b6c87993fb3315f2f5940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>