Merge "Update the disabled-opa navbar icon size to reflect icon change" into...

Merge "Update the disabled-opa navbar icon size to reflect icon change" into tm-qpr-dev am: 3e4f1962 am: 940fcd1e

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



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