Merge "Skip resetting the stack protector on eng builds" am: 838c317e2d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2407872

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