Merge "Remove the *byteShort string resources from the frameworks" am: 73caeda3ad

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

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