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

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

am skip reason: subject contains skip directive

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



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