Merge changes I49495684,I0db2e0f4,I07bb811b am: 67665a4571

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

Change-Id: I34f8d9c4581d4092114bdaf3a8f92a33b67286a3