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

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

Change-Id: I68dd020a5dde088b468536044fb8479a88adbbc7