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

Merge "Merge "Remove the *byteShort string resources from the frameworks" am: 73caeda3 am: 8e6a5fa4" into tm-dev-plus-aosp am: 8576ae79 am: 8e567d3c am: 0d428919

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>