[automerger skipped] Merge "Don't clone the locale redundantly in...

[automerger skipped] Merge "Don't clone the locale redundantly in Configuration.setTo()" into rvc-qpr-dev am: 786165ba am: 98668119 -s ours

am skip reason: Change-Id I5dc0598b89305c488ba50c1774ecdabf939a6ccc with SHA-1 44c4994d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152573

Change-Id: I7766e0ce10ab11f40857248e2d1f788f474231cf