Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into...

Merge changes from topic "presubmit-am-08bbcb587d4e47b6afcc900c23899344" into sc-v2-dev am: 0f608efd

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

Change-Id: I35d157de8376b43f4359cd7243d12973704bf893