Merge changes I75017420,I3612e131 am: e3f4b84468 am: de50c0081b am: 8249a06f5f

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

Change-Id: I5d8407336e1c8ceb7fe2f99c4f2b00e93571a8de