Merge "Revert "Add additional files to hilt_android"" am: 3ba66ad179 am: 72dacad246 am: 0cd6a85513 am: 367408b057

Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1705750

Change-Id: Ia227a40eab2454397dede6b1c41cb18192a41989