Merge changes Iecc0d468,I928ddebc,Iade322a2 into sc-qpr1-dev am: 1d9e35c5bf

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15840709

Change-Id: I1d2efafb1d84581bb72359f3fa411a596a057f57