Merge changes from topic "am-fb609f1bb3354ce28c51afe7d2a1c748" into tm-dev am: 90d93348 -s ours

am skip reason: Merged-In I7e83544863eeadf8272b6ff8a9bb8136d6466203 with SHA-1 62845d9a is already in history

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



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