[automerger skipped] Id for text2 is defined in ids.xml already. am: 0e338eeb am: 082f8320 -s ours am: 775a2bfa -s ours

am skip reason: Merged-In I8f50cf85fb46fdc8d661d2f60f1af55df71036fc with SHA-1 0e338eeb is already in history

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



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