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: Ib8767ed8ae9145ccc9e59dfcba7f5f05e165553d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>