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

Change-Id: I7d3c453536a272c969745ad2df4c9bf319efc19b