Merge changes from topic "two_pane_state" into sc-v2-dev am: 05896ef5fb am: ac5fa697d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16101559

Change-Id: Ic75257f310834f0ac3236487bea1e910f7018f1b