Merge "Set correct uid for headless system 0 in DnD PreferencesHelperTest" into sc-dev am: 173286e254 am: 2256cd9baf am: 2539601e97

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

Change-Id: I80f21732c29ea993c78bc6423bb789a25af0e273