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

Change-Id: I6f04ca71a2a4af1cfb4bc07019f991bc845fd8e6