Merge changes from topic "FK_168687572" into sc-qpr1-dev am: 3ab3c04d am: 1210ca0b am: 1de2f1fc

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

Change-Id: I7ab6f8e678dc67343f8cd75ed9c04aa5997f9f48