Merge changes I219f956b,I281937e2 am: a216080a63 am: fc8ed5d9d5 am: 46404dc911 am: b361dccb68

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

Change-Id: If35793fc0c3043d4a1351dda842cb8001c387f2a