Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into...

Merge changes from topic "am-1f14ab54c2414b4ca60bb589f9ee6837" into tm-d1-dev-plus-aosp am: 6794f081

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



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