Merge changes from topic "am-4d6ad82e46eb430685e35e0bf1b406a4" am: 7dc4933f am: 29a04872

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



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