Merge "Respect partition precedence while deciding overlay priority" am: 9f25e02fa3 am: 8579fa7af4

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

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