Merge "Remove unnecessary ASLR workaround" am: 93f5f96418 am: cd21536cd4 am: 9bbdf18d5d

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

Change-Id: I3d9144638de6413826ac6c66e6ea9b8a589081d1