Merge "Re-add call to isActive as it was made a SystemApi"
tree: c35921ed728baf34e67345db6aeb1e40f1f24aa0
  1. android/