Merge "Remove non-updatable-* prefix from .txt files" am: 9417be4487

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

Change-Id: I93f1652c6fbcf66c202c19f29e9013e2cebea0ea