Merge changes from topics "presubmit-am-18cfee8fd4a246488709515ab35ce4dd", "presubmit-am-909842e21190489984382774e830cfd7" into tm-dev am: 9f4d4e73 am: 20381a03 am: 5209043c

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



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