am: 421806380d
* commit '421806380dcb971755caf4e61756a38566469f6e':
Un-deprecate Activity#onRetainNonConfigurationInstance
am: 421806380d
* commit '421806380dcb971755caf4e61756a38566469f6e':
Un-deprecate Activity#onRetainNonConfigurationInstance