Merge "Update override config to include some changes from global config" into nyc-dev

am: 88be465ce5

* commit '88be465ce572f84649e01744a7ec96b6346b3686':
  Update override config to include some changes from global config

Change-Id: I0f1f9f64bcd81321f44c48cd01537749ac4727ea

diff --cc services/core/java/com/android/server/am/TaskRecord.java
Simple merge