Merge "Move Settings app to /product"
am: 0a399bf543

Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d