Merge changes from topic "sdksys" am: 0a264aa980

Original change: https://android-review.googlesource.com/c/platform/development/+/2073609

Change-Id: I1b54052b0b9534cbd8c9a2593932bfbb5f049bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>