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

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

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