Merge "Fixes nav stack issue." into udc-dev am: b5dda005 am: 1e3ecf63

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



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