Merge "Merge "Use userId 0 to bind the DisplayHashingService" into sc-dev am:...

Merge "Merge "Use userId 0 to bind the DisplayHashingService" into sc-dev am: b91aa916 am: 61087b13" into sc-v2-dev-plus-aosp am: 249f6cd5

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

Change-Id: Iba0b4da77f917e315aac1dfc81beaee3955c0bab