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

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

Change-Id: Ifd17f12c911cd14681f31b4aa3b485d1d5fa5127