Merge "Ensure clearCallingIdentity for getDisplayContentOrCreate"