[automerger skipped] Merge "Remove non-updatable-* prefix from .txt files" am:...

[automerger skipped] Merge "Remove non-updatable-* prefix from .txt files" am: 9417be44 am: c1bdaa0a am: efcb2945 -s ours am: 53330495 -s ours

am skip reason: Merged-In I365be0a45126a6a056d5219e24ef93020c034c87 with SHA-1 8168dc28 is already in history

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

Change-Id: I319ceafa5cacfd576a8d432371a5c6859569aa4c