Merge "Explicitly keep default constructor in rules without members" into main am: c31ef6e7d9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3438621

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