am 846dda3f: Merge "Add new disabled state for "optional" built-in apps."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '846dda3fa7a194b57acdb977e443c93c7cddcea1':
  Add new disabled state for "optional" built-in apps.