[automerger skipped] Merge "DO NOT MERGE: Limit the ServiceFriendlyNames" into rvc-qpr-dev am: 4de0740bf8 -s ours am: d294e11427 -s ours am: 346ad5fada -s ours am: a274175a7b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988 Change-Id: I5d73b7e0ca5c9936a0b9d3538c4ef1d24af8b4a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: