[automerger skipped] Merge changes from topic "V" am: bd3b1b81 am: f0d2d468 am: 467f8749 -s ours am: 417a6e87 -s ours

am skip reason: Merged-In I1b0a9d667cd481e91cfe473747a9ad38f77b4455 with SHA-1 c7ffdf8b is already in history

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



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