Merge "[FUI21] Move scrubSubscriberId to utils class" am: f6c7f61d27 am: 348c9dd703 am: 8e1ebd6408

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If957a1c5017ab9600bbdece527543885a17ed2aa
tree: 5a6f79c85f608d7b373cac9bf4729e5d22db68e5
  1. core/
  2. services/