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