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

Merge "Only offset header icon when description is possible to overlap keyboard" into udc-dev am: d86324d3

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



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