Merge "Companion Device App showing in Settings" into sc-dev am: e14cc634dc am: 40c712e007
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14148351 Change-Id: I50179402e41220a22d176d534c3b9d06f3e47479
This commit is contained in: