Merge changes from topic "presubmit-am-c27d278e0e0841f2885908c9fdb81c7a" into...

Merge changes from topic "presubmit-am-c27d278e0e0841f2885908c9fdb81c7a" into tm-dev am: 7b5eb574 am: edaf2ebf

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



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