Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c am: 0819ab21c5 am: fabd6033e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998 Change-Id: I59d11f8cb927c0b710b2f7283eeb7e43cd2d4401
This commit is contained in: