Merge "Remove unnecessary ASLR workaround" am: 93f5f96418 am: cd21536cd4 am: 9bbdf18d5d am: 1ed76117cf am: 6c38504c15

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

Change-Id: I9075d728788b9e9d7a74945e5f80769bb88fab4c