Merge changes from topic "presubmit-am-2a57cf6b59364104b426c1cc5809724d" into tm-mainline-prod am: 22242a7755

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

Change-Id: Ie7294cf7a67e4346fd316d41695f0d940a4ea41a