Merge "Remove the *byteShort string resources from the frameworks" am: 73caeda3 am: 8e6a5fa4

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



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