Merge "Fix Z-ordering of simultaneous HUNs" into rvc-qpr-dev am: 608db6dc09

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

Change-Id: I664a0e2a9cdbf534b6541f48b730dd0135a51fa7