Merge "Add an unknown type for entries." into main am: 1e23777a1f

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3367960

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