Merge "Remove unnecessary ASLR workaround" am: 93f5f96418

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

Change-Id: I178f2bb4459ed57a62893e3d60185a0084edcedf