Removing upstream flag as it is now the default. am: aa0c17a33e Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/3442920 Change-Id: I91c9895624b96525d81d45c509468c08c8e7380d Signed-off-by: Automerger Merge Worker <[email protected]>