am 7f54ffd0: Merge "Improve configuration of default preferred apps."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '7f54ffd0296ce6008b5ea949796e60248a85e2d8':
  Improve configuration of default preferred apps.