Merge changes I49495684,I0db2e0f4,I07bb811b am: 67665a4571 am: f6016177f2 am: 44cb302f6e am: 601c99bae5

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

Change-Id: I3375f950a8b24b65ec2c922a24b36740ff7466ee