Merge "Use current user id when invoking omnient." into 24D1-dev am: 2094a139

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



Change-Id: Ie814e64c8ec8549d092b1872ee1e9344d3ec0c29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>