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

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



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