Distinguish between selected panel or structure am: 82587b1a42 am: aab0b5502e

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

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