Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into tm-dev am: 2fbe6354

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



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