Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a28...

Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a28 am: e6d79549 am: 71b0098f

Original change: https://android-review.googlesource.com/c/platform/build/+/2624469



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