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

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

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



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