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

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

Change-Id: I3e70329ab9656efcf286f7b51d8deec2d36328e0