[automerger skipped] Added empty subscription manager service am: 36f55c44...

[automerger skipped] Added empty subscription manager service am: 36f55c44 am: e64ef5a1 am: a76b2948 -s ours am: 8d10fd30 -s ours

am skip reason: Merged-In I66716314a2e5679e5a4fb7a9e429ae547bd0951d with SHA-1 1d6980cc is already in history

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



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