Merge "Change Android-specific customizations that get preserved." into main am: bd4961688e

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

Change-Id: I14a5584ee78a8b54e7dbf9c1c9eafda5e8581526
Signed-off-by: Automerger Merge Worker <[email protected]>