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

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

Change-Id: Ibe71cbe11ad517dd72c8eaba95ffcdceb7e0900c