DO NOT MERGE - Merge ab/7272582 am: 95150cc25a

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

Change-Id: I99d6c20902be38a34fef9ff0303a9f8aab73ef51