tree ca82f029f66ae66a30474eac854b782a83458a97
parent cce5e4f4a2c09ee11fa20ec1f8adf2a0f5b088db
parent 82e5908df04db95235aea76e58fa4bd5acb99afe
author Leo Hsu <leohsu@google.com> 1538701602 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1538701602 +0000

Merge changes from topics "remove_feature_flag_emergency", "faster_emergency_feature_flag" into pi-dev

* changes:
  RESTRICT AUTOMERGE: Removes feature flag for faster emergency call.
  Add new metrics in power menu
  Add feature flag in Settings.