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

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

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