Merge changes from topic "am-9ffc56c33d6e48c9bec7223ec4f11d94" into...

Merge changes from topic "am-9ffc56c33d6e48c9bec7223ec4f11d94" into sc-v2-dev-plus-aosp am: 7dc257bf

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

Change-Id: Iea63ea3fbf5e3c3266c3cbe6b5303314c52c65b6