Merge changes from topic "am-396da171ad8a43c0aee8ffda5735e69a" into sc-qpr1-dev-plus-aosp am: c4470ea6

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

Change-Id: I3f6b26f3a5751cca05123b829a7f1fba4b521f23