Merge "Revert "Removes left/right buttons from bottom area."" into tm-qpr-dev am: 9bf63618

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



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