Merge changes from topic "presubmit-am-3bd174ffe2b040e3952f38ca47423e3e" into tm-mainline-prod am: dcba2acd

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

Change-Id: I8777304ddf58ff55478f3442018fe9600b0749e2