am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev
am 9123e666: Merge "Update cached child enabled state before selector state" into mnc-dev

* commit '9123e666bb1a54b466c678400c344c1bb3a266f9':
  Update cached child enabled state before selector state

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base