[automerger skipped] Merge "Add a missing test dependency for...

[automerger skipped] Merge "Add a missing test dependency for UpdatableSystemFontTest" am: d5a3ba98 -s ours

am skip reason: Merged-In Ic1b5b94aabd4c95744109f2cc7443ae04c43b3a6 with SHA-1 5533e7fb is already in history

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



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