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

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

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



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