Merge "Add null check before finish SystemUI Tuner's activity"
am: 5bb91bacc3

Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b