Merge changes I75017420,I3612e131 am: e3f4b84468

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

Change-Id: I61e02fb220fe60da1a80a3fa8f2b92a42412e0d8