[automerger skipped] Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513" am: e311048d80 -s ours

am skip reason: Merged-In Ibc2f99ba766419fdb491c49317b9fb5ae13138ef with SHA-1 9290fc7b9d is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2037145

Change-Id: Ib2d18b6422868581ec10b67b0a6212f9ec38eae0