Merge changes from topic "presubmit-am-11ef4e3648214d1aabef3b795a4830d6" into...

Merge changes from topic "presubmit-am-11ef4e3648214d1aabef3b795a4830d6" into tm-dev am: 294898b5 am: 9d309b7f

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



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