Merge changes I350c8c88,I1e462fad am: 6c31ab7a13 am: d22ff3b332

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

Change-Id: I68bd71f3eda45df98ed7c1eecb051142d8a3d26e