Merge changes from topic "bug_168791309" am: 8d96bfa9bd

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

Change-Id: I40f47d42101e9e62ec27341a3fb0847d9b5f3d2b