Merge changes from topic "unify_getentryinfo" into main am: dc2cfc8a10 am: f2be4873ee

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

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