Merge "[HostStubGen] Now method descriptor is optional in policy files" into...

Merge "[HostStubGen] Now method descriptor is optional in policy files" into main am: 96e2c406 am: 5c65f95c

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



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