[automerger skipped] Merge "Update modules to allow empty impls" into...

[automerger skipped] Merge "Update modules to allow empty impls" into udc-qpr-dev am: 1509cd7a am: ab33c814 -s ours

am skip reason: Merged-In If7918ed932a8945d2e014ffd1a741ba93ae17580 with SHA-1 118d3ae1 is already in history

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



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