Merge "Merge "Remove the *byteShort string resources from the frameworks" am: 73caeda3ad am: 8e6a5fa450" into tm-dev-plus-aosp am: 8576ae798a am: 8e567d3c30 am: 0d4289194b

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

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