Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd
am: 1e3ecf6352
am: 163c01ab4c
am: 42521b3663
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23573917 Change-Id: I96ecf14b13246642ae01e57b9cd94c69e9a7903b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: