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: d3620cfc

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



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