am fb58f56d: am 543a86c1: Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev

* commit 'fb58f56d3a9c6654f362e18a0dedc417b873a96c':
  Removing the screenOrientation attribute from the wearable manifest