Merge "Merge "Only offset header icon when description is possible to overlap...

Merge "Merge "Only offset header icon when description is possible to overlap keyboard" into udc-dev am: d86324d3 am: e6164e4e am: 4190df18" into udc-qpr-dev-plus-aosp am: eb10b573

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



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