Merge changes from topic "presubmit-am-148ae84ab2d94264b46d5c99cb0a15aa" into tm-mainline-prod am: 17854f90

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

Change-Id: Icc1d17592640ac5a8721a25fe05cfee0df3b9da7
Signed-off-by: Automerger Merge Worker