Merge "fix the NPE problem when the button_bar_container layout is not...

Merge "fix the NPE problem when the  button_bar_container layout is not config." into main am: 102feefd am: f10a4475

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



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