Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: 21f732e67c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59c31da9c2ba69ee74cbf64e3af42331e9b7bfca
tree: cc01c0070da8d76a0d8ac2a28bc26d7e2f38ddc0
  1. core/
  2. services/