Merge changes from topic "FK_168687572" into sc-qpr1-dev am: 3ab3c04d28

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

Change-Id: Icc82dbbfe1a61aa4c0aa55764fab61667df8ab00