Merge changes from topic "sysbg_aosp" am: 1132977223 am: d7c942ad46 am: 808464a9d0 am: 04557e2fd7

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

Change-Id: If86ac12773f741c72849fae81e0e7eb683b74bb0