Merge changes I49495684,I0db2e0f4,I07bb811b am: 67665a4571 am: f6016177f2

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

Change-Id: I3ce6ec736429a7fe31c9625a33511c6994761d4a