Merge "Do not let snapshot window control the bar" into sc-v2-dev am: 61569f50 am: a5f2f84f

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

Change-Id: I6e7c6c1e7ac248fec4fff543635055a6381880c1