Merge "Merge "Enable 3 button nav for taskbar" into sc-v2-dev am: 52551c91"...

Merge "Merge "Enable 3 button nav for taskbar" into sc-v2-dev am: 52551c91" into sc-v2-dev-plus-aosp am: 55824da3

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

Change-Id: I88c8fc26a69132f37dfc29c6192c400096ecf8db