Merge "Add perm split W_E_S to A_M_L and sort" into tm-dev am: 5c375eac

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



Change-Id: If7549d41a903b30a798451f58a620d5823ff0b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>