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

Change-Id: Ibd1b9ff4be577bf5ea5596342316ea2303d93b75