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

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

Change-Id: I02bfd0e55ed72f5391f3bb3133e74bb815c99f7b
Signed-off-by: Automerger Merge Worker <[email protected]>