[automerger skipped] Id for text2 is defined in ids.xml already. am:...

[automerger skipped] Id for text2 is defined in ids.xml already. am: 0e338eeb am: 1ed20bb7 am: 668e080e -s ours

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

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



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