Merge changes I779184f1,I241ee11d into sc-qpr1-dev am: d6383199e8

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

Change-Id: I1eb2a86623258bf10081f908bfc3b6187b244e93