Merge "Merge "Hide manage menu in overflow" into rvc-dev am: 38694c29 am: 9c1888a0 am: a22503a3" into rvc-qpr-dev-plus-aosp am: 1aff23bc

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

Change-Id: I7084598efff0aa6ef4cbcb7ad56da40e3469755c