[automerger skipped] Merge "Add per glyph filter for tweaking glyph positions...

[automerger skipped] Merge "Add per glyph filter for tweaking glyph positions for animation" into tm-qpr-dev am: e4e9587d am: 9eaafb88 -s ours

am skip reason: Merged-In I721860b78496e9a272b086c246ce0781e3fdc37f with SHA-1 b0080f94 is already in history

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



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