Merge "Fix SearchScaffold navigation back arrow" into udc-dev am: ad3db82a

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



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