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 am: 1de99f4d

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



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