Merge "Allow adding class/struct members to padding space" am: 4f2576b93a am: 4384b4cdd0 am: 5c30332ddd am: d8183bf29f

Original change: https://android-review.googlesource.com/c/platform/development/+/2238294

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