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

Change-Id: I6abd73d3ce02dd33dc95c6132b1ff8aa4b13015c