Merge "Configuration for preprocessor symbol ALLOW_DISABLE_VERITY (followup for: f61f41494e)." am: 8b6dcf4432

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2106730

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