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

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

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



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