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

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

Change-Id: Iff75596cd03c73bb84783e6fc4fb0b14fc8fc137