Merge "Move screenshot UI to avoid covering nav bar" into sc-qpr1-dev am: 7fd08a9f am: 67f60bb4

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

Change-Id: Iaceb0d409a522250f710a83b435708a36cb96622