[automerger skipped] Merge "Move Settings app to /product" am: 0a399bf543
am: 297fe94122
am:403fe5d83c
-s ours am skip reason: change_id Iee5940125af3f2a8543ecb3a68d7fba737acd77d with SHA1f109282c8e
is in history Change-Id: I0c6d59fd5d2aa9233fc801e3ab002e3d8ecc5e65
This commit is contained in: