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

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

Change-Id: Ia6eedd03724b420e11686b196fee0cd30b151bff