Merge changes from topic "presubmit-am-fc5cbd46af764774b734634f6be03d6b" into tm-dev am: 2be0594a am: 7490f895 am: 7cbaf578

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



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