Merge changes from topic "sdksys" am: 0a264aa980 am: 460b007629

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

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